From 5f8258109e9bad2bf2e19cf9b65ba8ed35182dd8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 28 Jul 2020 15:46:05 +0200 Subject: [PATCH] gtkwindow: Move away from gdk_device_get_state() Use gdk_device_get_modifier_state() poking the keyboard and keymap, instead of this function. --- gtk/gtkwindow.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index a0fdd39229..a158c6cb09 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -4749,7 +4749,6 @@ gtk_window_real_activate_focus (GtkWindow *window) static gboolean gtk_window_has_mnemonic_modifier_pressed (GtkWindow *window) { - GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GList *seats, *s; gboolean retval = FALSE; @@ -4757,10 +4756,10 @@ gtk_window_has_mnemonic_modifier_pressed (GtkWindow *window) for (s = seats; s; s = s->next) { - GdkDevice *dev = gdk_seat_get_pointer (s->data); + GdkDevice *dev = gdk_seat_get_keyboard (s->data); GdkModifierType mask; - gdk_device_get_state (dev, priv->surface, NULL, &mask); + mask = gdk_device_get_modifier_state (dev); if ((mask & gtk_accelerator_get_default_mod_mask ()) == GDK_ALT_MASK) { retval = TRUE; -- 2.30.2